Fix render --reset=false not fast-forwarding existing branches to latest remote#24
Merged
Fix render --reset=false not fast-forwarding existing branches to latest remote#24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
When creating a worktree from an existing branch with
--reset=false, callupdateWorktreeRemote()to fast-forward the branch toorigin/<branch>after checkout.Why
The local branch ref in the bare repo can be stale when another worktree already has that branch checked out — git skips updating checked-out branches during
fetch --all. Without the fast-forward, the new worktree would be created pointing at a stale commit instead of the latest remote state.